# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.930.54.6 -> 1.930.54.7 # drivers/scsi/simscsi.c 1.1 -> 1.2 # drivers/char/simserial.c 1.1 -> 1.2 # drivers/net/simeth.c 1.1 -> 1.2 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 03/03/13 alan@lxorguk.ukuu.org.uk 1.930.69.27 # [PATCH] PATCH dpt_i2o sign fix # # -------------------------------------------- # 03/03/13 bjorn_helgaas@hp.com 1.930.52.16 # Merge hp.com:/home/helgaas/bk/ia64-extras # into hp.com:/home/helgaas/bk/linux-ia64-2.4 # -------------------------------------------- # 03/03/13 trini@kernel.crashing.org 1.930.57.5 # PPC32: Backport the code from 2.5 to make do_div handle 64bit. # -------------------------------------------- # 03/03/13 trini@kernel.crashing.org 1.930.57.6 # PPC32: KGDB is more useful when -g is in the CFLAGS. # -------------------------------------------- # 03/03/13 alan@lxorguk.ukuu.org.uk 1.930.69.28 # [PATCH] PATCH: fix ide-scsi hang on SMP boxes # # -------------------------------------------- # 03/03/13 alan@lxorguk.ukuu.org.uk 1.930.69.29 # [PATCH] PATCH: ; fixes # # -------------------------------------------- # 03/03/13 alan@lxorguk.ukuu.org.uk 1.930.69.30 # [PATCH] PATCH: ips update # # -------------------------------------------- # 03/03/13 trini@kernel.crashing.org 1.930.57.7 # PPC32: Fix some warnings in the MPC8xx FPU emulation code. # -------------------------------------------- # 03/03/13 alan@lxorguk.ukuu.org.uk 1.930.69.31 # [PATCH] PATCH: wrong bracketing # # -------------------------------------------- # 03/03/13 alan@lxorguk.ukuu.org.uk 1.930.69.32 # [PATCH] PATCH: XpressAudio enabler for Cyrix 5520 # # -------------------------------------------- # 03/03/13 alan@lxorguk.ukuu.org.uk 1.930.69.33 # [PATCH] PATCH: maestro bracketing bug # # -------------------------------------------- # 03/03/13 alan@lxorguk.ukuu.org.uk 1.930.69.34 # [PATCH] PATCH: values cannot be init # # -------------------------------------------- # 03/03/13 alan@lxorguk.ukuu.org.uk 1.930.69.35 # [PATCH] PATCH: fix large I/O to nec audio # # -------------------------------------------- # 03/03/13 trini@kernel.crashing.org 1.930.57.8 # PPC32: Fix some warnings on MPC8xx. # -------------------------------------------- # 03/03/13 alan@lxorguk.ukuu.org.uk 1.930.69.36 # [PATCH] PATCH: bracketing fix in sscape # # -------------------------------------------- # 03/03/13 alan@lxorguk.ukuu.org.uk 1.930.69.37 # [PATCH] PATCH: ali5451 is 31bit audio # # -------------------------------------------- # 03/03/13 jgarzik@redhat.com 1.930.71.1 # Via Nehemiah (C3-2) CPU support # # Fixes reboot-on-boot problem for people who [mistakenly] built # old-C3 support and then booted that kernel on their new-C3 CPU. # # Originally written by davej, backported from 2.5.x by me. # -------------------------------------------- # 03/03/13 alan@lxorguk.ukuu.org.uk 1.930.69.38 # [PATCH] PATCH: via8233/8235 audio update # # -------------------------------------------- # 03/03/13 alan@lxorguk.ukuu.org.uk 1.930.69.39 # [PATCH] PATCH: & v && in acm usb # # -------------------------------------------- # 03/03/13 alan@lxorguk.ukuu.org.uk 1.930.69.40 # [PATCH] PATCH: usb hang fix # # -------------------------------------------- # 03/03/14 paulus@samba.org 1.930.1.81 # Merge samba.org:/home/paulus/kernel/linux-2.4 # into samba.org:/home/paulus/kernel/for-marcelo-ppc # -------------------------------------------- # 03/03/14 paulus@samba.org 1.930.1.82 # Merge bk://stop.crashing.org/linux-2.4-misc # into samba.org:/home/paulus/kernel/for-marcelo-ppc # -------------------------------------------- # 03/03/14 dale@farnsworth.org 1.930.72.1 # PPC32: Make the bootloader start at 0x000c for SMP. # -------------------------------------------- # 03/03/14 trini@kernel.crashing.org 1.930.1.83 # Merge kernel.crashing.org:/home/trini/work/kernel/pristine/linux-2.4-misc # into kernel.crashing.org:/home/trini/work/kernel/pristine/for-marcelo-ppc # -------------------------------------------- # 03/03/14 green@linuxhacker.ru 1.930.68.6 # [PATCH] Memleak in KOBIL USB Smart Card Terminal Driver # # There is a memleak on error exit path in KOBIL USB Smart Card Terminal # Driver in both current 2.4 and 2.5. # See the patch. # Found with help of smatch + enhanced unfree script. # -------------------------------------------- # 03/03/14 johannes@erdfelt.com 1.930.68.7 # [PATCH] USB: uhci.c 2.4 finish completions in the correct order # # Here's a patch to finish completions in the order they occur. This # brings uhci.c in line with the other HCDs and what people generally # would expect. # -------------------------------------------- # 03/03/14 peter@chubb.wattle.id.au 1.930.67.28 # [PATCH] ia64: declare test_bit() arg as "const" # # While you're fixing bitops.h, making test_bit take a const qualified # arg will kill some warnings in reiserfs... # -------------------------------------------- # 03/03/14 green@linuxhacker.ru 1.930.68.8 # [PATCH] USB: more Edgeport USB Serial Converter driver stuff # -------------------------------------------- # 03/03/14 green@linuxhacker.ru 1.930.68.9 # [PATCH] USB: Memleak in drivers/usb/hub.c::usb_reset_device # # There seems to be a memleak in drivers/usb/hub.c::usb_reset_device() # on error exit path. See the patch. # Found with help of smatch + enhanced unfree script. # -------------------------------------------- # 03/03/14 green@linuxhacker.ru 1.930.68.10 # [PATCH] USB: memleak in Edgeport USB Serial Converter driver # -------------------------------------------- # 03/03/14 greg@kroah.com 1.930.68.11 # [PATCH] USB: fixup from previous io_ti.c patch # -------------------------------------------- # 03/03/14 bjorn_helgaas@hp.com 1.930.67.29 # ia64: Use printk severity-levels where appropriate. # Triggered by analysis done by Philipp Marek. # (Ported from 2.5 change by Bjorn Helgaas). # -------------------------------------------- # 03/03/14 bjorn_helgaas@hp.com 1.930.54.7 # ia64: Use printk severity-levels where appropriate. # Triggered by analysis done by Philipp Marek. # (Ported from 2.5 change by Bjorn Helgaas). # (Simulator drivers aren't under arch/ia64 in 2.4). # -------------------------------------------- # diff -Nru a/drivers/char/simserial.c b/drivers/char/simserial.c --- a/drivers/char/simserial.c Wed Oct 8 09:06:57 2003 +++ b/drivers/char/simserial.c Wed Oct 8 09:06:57 2003 @@ -7,7 +7,7 @@ * case means sys_sim.c console (goes via the simulator). The code hereafter * is completely leveraged from the serial.c driver. * - * Copyright (C) 1999-2000, 2002 Hewlett-Packard Co + * Copyright (C) 1999-2000, 2002-2003 Hewlett-Packard Co * Stephane Eranian * David Mosberger-Tang * @@ -184,7 +184,7 @@ */ info = IRQ_ports[irq]; if (!info || !info->tty) { - printk("simrs_interrupt_single: info|tty=0 info=%p problem\n", info); + printk(KERN_INFO "simrs_interrupt_single: info|tty=0 info=%p problem\n", info); return; } /* @@ -208,13 +208,13 @@ static void do_serial_bh(void) { run_task_queue(&tq_serial); - printk("do_serial_bh: called\n"); + printk(KERN_ERR "do_serial_bh: called\n"); } #endif static void do_softint(void *private_) { - printk("simserial: do_softint called\n"); + printk(KERN_ERR "simserial: do_softint called\n"); } static void rs_put_char(struct tty_struct *tty, unsigned char ch) @@ -424,7 +424,7 @@ { if (I_IXOFF(tty)) rs_send_xchar(tty, STOP_CHAR(tty)); - printk("simrs_throttle called\n"); + printk(KERN_INFO "simrs_throttle called\n"); } static void rs_unthrottle(struct tty_struct * tty) @@ -437,7 +437,7 @@ else rs_send_xchar(tty, START_CHAR(tty)); } - printk("simrs_unthrottle called\n"); + printk(KERN_INFO "simrs_unthrottle called\n"); } /* @@ -459,29 +459,29 @@ switch (cmd) { case TIOCMGET: - printk("rs_ioctl: TIOCMGET called\n"); + printk(KERN_INFO "rs_ioctl: TIOCMGET called\n"); return -EINVAL; case TIOCMBIS: case TIOCMBIC: case TIOCMSET: - printk("rs_ioctl: TIOCMBIS/BIC/SET called\n"); + printk(KERN_INFO "rs_ioctl: TIOCMBIS/BIC/SET called\n"); return -EINVAL; case TIOCGSERIAL: - printk("simrs_ioctl TIOCGSERIAL called\n"); + printk(KERN_INFO "simrs_ioctl TIOCGSERIAL called\n"); return 0; case TIOCSSERIAL: - printk("simrs_ioctl TIOCSSERIAL called\n"); + printk(KERN_INFO "simrs_ioctl TIOCSSERIAL called\n"); return 0; case TIOCSERCONFIG: - printk("rs_ioctl: TIOCSERCONFIG called\n"); + printk(KERN_INFO "rs_ioctl: TIOCSERCONFIG called\n"); return -EINVAL; case TIOCSERGETLSR: /* Get line status register */ - printk("rs_ioctl: TIOCSERGETLSR called\n"); + printk(KERN_INFO "rs_ioctl: TIOCSERGETLSR called\n"); return -EINVAL; case TIOCSERGSTRUCT: - printk("rs_ioctl: TIOCSERGSTRUCT called\n"); + printk(KERN_INFO "rs_ioctl: TIOCSERGSTRUCT called\n"); #if 0 if (copy_to_user((struct async_struct *) arg, info, sizeof(struct async_struct))) @@ -496,7 +496,7 @@ * Caller should use TIOCGICOUNT to see which one it was */ case TIOCMIWAIT: - printk("rs_ioctl: TIOCMIWAIT: called\n"); + printk(KERN_INFO "rs_ioctl: TIOCMIWAIT: called\n"); return 0; /* * Get counter of input serial line interrupts (DCD,RI,DSR,CTS) @@ -505,13 +505,13 @@ * RI where only 0->1 is counted. */ case TIOCGICOUNT: - printk("rs_ioctl: TIOCGICOUNT called\n"); + printk(KERN_INFO "rs_ioctl: TIOCGICOUNT called\n"); return 0; case TIOCSERGWILD: case TIOCSERSWILD: /* "setserial -W" is called in Debian boot */ - printk ("TIOCSER?WILD ioctl obsolete, ignored.\n"); + printk (KERN_INFO "TIOCSER?WILD ioctl obsolete, ignored.\n"); return 0; default: @@ -581,7 +581,7 @@ IRQ_T(info), "serial", NULL); if (retval) - printk("serial shutdown: request_irq: error %d" + printk(KERN_ERR "serial shutdown: request_irq: error %d" " Couldn't reacquire IRQ.\n", retval); } else free_irq(state->irq, NULL); @@ -639,12 +639,12 @@ * one, we've got real problems, since it means the * serial port won't be shutdown. */ - printk("rs_close: bad serial port count; tty->count is 1, " + printk(KERN_ERR "rs_close: bad serial port count; tty->count is 1, " "state->count is %d\n", state->count); state->count = 1; } if (--state->count < 0) { - printk("rs_close: bad serial port count for ttys%d: %d\n", + printk(KERN_ERR "rs_close: bad serial port count for ttys%d: %d\n", info->line, state->count); state->count = 0; } @@ -999,7 +999,7 @@ static inline void show_serial_version(void) { printk(KERN_INFO "%s version %s with", serial_name, serial_version); - printk(" no serial options enabled\n"); + printk(KERN_INFO " no serial options enabled\n"); } /* diff -Nru a/drivers/net/simeth.c b/drivers/net/simeth.c --- a/drivers/net/simeth.c Wed Oct 8 09:06:57 2003 +++ b/drivers/net/simeth.c Wed Oct 8 09:06:57 2003 @@ -2,7 +2,7 @@ * Simulated Ethernet Driver * * Copyright (C) 1999-2001 Hewlett-Packard Co - * Copyright (C) 1999-2001 Stephane Eranain + * Copyright (C) 1999-2001, 2003 Stephane Eranain */ #include #include @@ -116,7 +116,7 @@ { int r; - printk("simeth: v%s\n", simeth_version); + printk(KERN_INFO "simeth: v%s\n", simeth_version); r = simeth_probe1(); @@ -235,7 +235,8 @@ /* Fill in the fields of the device structure with ethernet-generic values. */ ether_setup(dev); - printk("%s: hosteth=%s simfd=%d, HwAddr", dev->name, simeth_device, local->simfd); + printk(KERN_INFO "%s: hosteth=%s simfd=%d, HwAddr", + dev->name, simeth_device, local->simfd); for(i = 0; i < ETH_ALEN; i++) { printk(" %2.2x", dev->dev_addr[i]); } @@ -251,7 +252,7 @@ simeth_open(struct net_device *dev) { if (request_irq(dev->irq, simeth_interrupt, 0, "simeth", dev)) { - printk ("simeth: unable to get IRQ %d.\n", dev->irq); + printk(KERN_WARNING "simeth: unable to get IRQ %d.\n", dev->irq); return -EAGAIN; } @@ -312,11 +313,12 @@ if (strcmp(dev->name, ifa->ifa_label) == 0) break; } if ( ifa == NULL ) { - printk("simeth_open: can't find device %s's ifa\n", dev->name); + printk(KERN_ERR "simeth_open: can't find device %s's ifa\n", dev->name); return NOTIFY_DONE; } - printk("simeth_device_event: %s ipaddr=0x%x\n", dev->name, htonl(ifa->ifa_local)); + printk(KERN_INFO "simeth_device_event: %s ipaddr=0x%x\n", + dev->name, htonl(ifa->ifa_local)); /* * XXX Fix me @@ -330,7 +332,8 @@ netdev_attach(local->simfd, dev->irq, htonl(ifa->ifa_local)): netdev_detach(local->simfd); - printk("simeth: netdev_attach/detach: event=%s ->%d\n", event == NETDEV_UP ? "attach":"detach", r); + printk(KERN_INFO "simeth: netdev_attach/detach: event=%s ->%d\n", + event == NETDEV_UP ? "attach":"detach", r); return NOTIFY_DONE; } @@ -460,7 +463,8 @@ */ len = netdev_read(local->simfd, skb->data, SIMETH_FRAME_SIZE); if ( len == 0 ) { - if ( simeth_debug > 0 ) printk(KERN_WARNING "%s: count=%d netdev_read=0\n", dev->name, SIMETH_RECV_MAX-rcv_count); + if ( simeth_debug > 0 ) printk(KERN_WARNING "%s: count=%d netdev_read=0\n", + dev->name, SIMETH_RECV_MAX-rcv_count); break; } #if 0 diff -Nru a/drivers/scsi/simscsi.c b/drivers/scsi/simscsi.c --- a/drivers/scsi/simscsi.c Wed Oct 8 09:06:57 2003 +++ b/drivers/scsi/simscsi.c Wed Oct 8 09:06:57 2003 @@ -1,7 +1,7 @@ /* * Simulated SCSI driver. * - * Copyright (C) 1999, 2001-2002 Hewlett-Packard Co + * Copyright (C) 1999, 2001-2003 Hewlett-Packard Co * David Mosberger-Tang * Stephane Eranian * @@ -86,7 +86,8 @@ { /* XXX Fix me we may need to strcpy() ? */ if (strlen(s) > MAX_ROOT_LEN) { - printk("simscsi_setup: prefix too long---using default %s\n", simscsi_root); + printk(KERN_ERR "simscsi_setup: prefix too long---using default %s\n", + simscsi_root); } simscsi_root = s; return 1; @@ -353,7 +354,7 @@ break; case START_STOP: - printk("START_STOP\n"); + printk(KERN_ERR "START_STOP\n"); break; default: @@ -379,14 +380,14 @@ int simscsi_reset (Scsi_Cmnd *cmd, unsigned int reset_flags) { - printk ("simscsi_reset: unimplemented\n"); + printk(KERN_ERR "simscsi_reset: unimplemented\n"); return SCSI_RESET_SUCCESS; } int simscsi_abort (Scsi_Cmnd *cmd) { - printk ("simscsi_abort: unimplemented\n"); + printk(KERN_ERR "simscsi_abort: unimplemented\n"); return SCSI_ABORT_SUCCESS; }